Skip to content

Remap both absolute and relative paths when building rustc and std #150283

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
Urgau wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Remap both absolute and relative paths when building rustc and std #150283

Urgau wants to merge 2 commits into from
+145 −5

Conversation

@Urgau
Copy link
Member

@Urgau Urgau commented Dec 22, 2025

Turns out #150110 didn't work as expected, because when the standard library sources are present, we helpfully un-remap the paths to the local directory of the user, including when we are building the compiler and standard library it-self (duh!), and since those paths are absolute (not relative), our purely relative remapping didn't pick them up.

This behavior wasn't a issue before because the un-remap logic immediately tries to remap them again, and since we had the absolute remapping we would just remap them to the the same thing.

To fix that issue I've adjusted our remapping to remap both the absolute and relative paths when building rustc and std, as well as added a run-make to make sure we don't regress it again (with a new needs-std-remap-debuginfo directive).

r? @jieyouxu

@rustbot
Copy link
Collaborator

rustbot commented Dec 22, 2025

compiletest directives have been modified. Please add or update docs for the
new or modified directive in src/doc/rustc-dev-guide/.

Some changes occurred in src/tools/compiletest

cc @jieyouxu

The rustc-dev-guide subtree was changed. If this PR only touches the dev guide consider submitting a PR directly to rust-lang/rustc-dev-guide otherwise thank you for updating the dev guide with your changes.

cc @BoxyUwU, @jieyouxu, @Kobzol, @tshepang

The run-make-support library was changed

cc @jieyouxu

@rustbot rustbot added A-compiletest Area: The compiletest test runner A-run-make Area: port run-make Makefiles to rmake.rs A-rustc-dev-guide Area: rustc-dev-guide A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Dec 22, 2025
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Urgau Urgau force-pushed the remap-debuginfo-absolute branch from bd16ded to 4d839da Compare December 22, 2025 18:44
@Urgau
Copy link
Member Author

Urgau commented Dec 22, 2025

@bors try jobs=dist-x86_64-linux

rust-bors bot added a commit that referenced this pull request Dec 22, 2025
@rust-bors
Auto merge of #150283 - Urgau:remap-debuginfo-absolute, r=<try>
859f7f2 
Remap both absolute and relative paths when building `rustc` and `std`

try-job: dist-x86_64-linux
@rust-bors

This comment has been minimized.

Sign in to view
@rust-bors
Copy link

rust-bors bot commented Dec 22, 2025

☀️ Try build successful (CI)
Build commit: 859f7f2 (859f7f266bef93a6e076540b803ea08242193c84, parent: 04813e4de86a5e024e71756ef092637aa862c984)

jieyouxu
jieyouxu approved these changes Dec 24, 2025
View reviewed changes
Copy link
Member

@jieyouxu jieyouxu left a comment •
edited by rustbot
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks

View changes since this review

src/bootstrap/src/core/builder/cargo.rs
// and for working directory) so let's remap the build directory as well.
format!("{}={map_to}", self.build.src.display()),
]
.join("\t");
Copy link
Member

@jieyouxu jieyouxu Dec 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remark: technically, I think filename parts of Windows(?)/Linux(?) paths can actually contain tabs, however, other tools have the tendency to also break on those, so I'm not worried about that possibility...

@jieyouxu
Copy link
Member

jieyouxu commented Dec 24, 2025

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Dec 24, 2025

📌 Commit 4d839da has been approved by jieyouxu

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 24, 2025
@jieyouxu
Copy link
Member

jieyouxu commented Dec 24, 2025 •
edited
Loading

@bors rollup=never (for bisection purposes)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jieyouxu jieyouxu jieyouxu approved these changes

Assignees

@jieyouxu jieyouxu

Labels

A-compiletest Area: The compiletest test runner A-run-make Area: port run-make Makefiles to rmake.rs A-rustc-dev-guide Area: rustc-dev-guide A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@Urgau @rustbot @rust-log-analyzer @jieyouxu @bors